* simple.el (read--expression): Don't enable eldoc-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa427396c7592239fe7387988f78e3f65c87d8e6..1f899700d468ac581104b778d0fe601aa5b19041 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-21  Leo Liu  <sdl.web@gmail.com>
+
+       * simple.el (read--expression): Don't enable eldoc-mode.
+
 2014-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (move-beginning-of-line): Make sure we don't move forward

diff --git a/lisp/simple.el b/lisp/simple.el
index 8e23b0804ca899bc072a9b8b0c15b83f449ba480..aacd3ccf1caa39df6c8de17c9ae73be7a737174a 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1387,7 +1387,6 @@ display the result of expression evaluation."
         (lambda ()
           (add-hook 'completion-at-point-functions
                     #'lisp-completion-at-point nil t)
-         (eldoc-mode 1)
           (run-hooks 'eval-expression-minibuffer-setup-hook))
       (read-from-minibuffer prompt initial-contents
                             read-expression-map t